From: OpenJDK Team <openjdk-21@packages.debian.org>
Date: Tue, 30 Jul 2024 06:37:36 +0000 (+0200)
Subject: default-jvm-cfg
X-Git-Tag: archive/raspbian/25.0.5_7ea-1+rpi1~1^2~46
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c170f81b4323cc7a4d3caf4437966cb370dbe6ac;p=openjdk-25.git

default-jvm-cfg


Gbp-Pq: Name default-jvm-cfg.diff
---

diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index 3b4a15bac..aa17ea40d 100644
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -2047,7 +2047,7 @@ jint
 ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
 {
     FILE *jvmCfg;
-    char line[MAXPATHLEN+20];
+    char line[MAXPATHLEN+30];
     int cnt = 0;
     int lineno = 0;
     jlong start = 0, end = 0;
@@ -2060,6 +2060,11 @@ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
     }
 
     jvmCfg = fopen(jvmCfgName, "r");
+    if (jvmCfg == NULL) {
+      char cfgName[strlen(jvmCfgName)+10];
+      sprintf(cfgName, "%s-default", jvmCfgName);
+      jvmCfg = fopen(cfgName, "r");
+    }
     if (jvmCfg == NULL) {
       if (!speculative) {
         JLI_ReportErrorMessage(CFG_ERROR6, jvmCfgName);